projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b19e46 1ac0736)
bitkeeper revision 1.1159.212.37 (41f6442d0VIx4x9hYxFJgoaH6RGtRg)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 25 Jan 2005 13:05:49 +0000 (13:05 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 25 Jan 2005 13:05:49 +0000 (13:05 +0000)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
BitKeeper/etc/ignore patch | diff1 | diff2 | blob | history
xen/Makefile patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc BitKeeper/etc/ignore
Simple merge
diff --cc xen/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.